diff --git a/camera/camera.py b/camera/camera.py
index bbd03e32..f461e02f 100644
--- a/camera/camera.py
+++ b/camera/camera.py
@@ -16,7 +16,7 @@ import time
 class Camera(object):
     CONFIG = {
         "background_image" : None,
-        "pixel_shape" : (DEFAULT_HEIGHT, DEFAULT_WIDTH),
+        "pixel_shape" : (DEFAULT_PIXEL_HEIGHT, DEFAULT_PIXEL_WIDTH),
         # Note: frame_shape will be resized to match pixel_shape
         "frame_shape" : (FRAME_HEIGHT, FRAME_WIDTH),
         "space_center" : ORIGIN,
diff --git a/constants.py b/constants.py
index faa3383e..abbe245d 100644
--- a/constants.py
+++ b/constants.py
@@ -1,8 +1,8 @@
 import os
 import numpy as np
 
-DEFAULT_HEIGHT = 1080
-DEFAULT_WIDTH  = 1920
+DEFAULT_PIXEL_HEIGHT = 1080
+DEFAULT_PIXEL_WIDTH  = 1920
 
 LOW_QUALITY_FRAME_DURATION = 1./15
 MEDIUM_QUALITY_FRAME_DURATION = 1./30
@@ -10,7 +10,7 @@ PRODUCTION_QUALITY_FRAME_DURATION = 1./60
 
 #There might be other configuration than pixel_shape later...
 PRODUCTION_QUALITY_CAMERA_CONFIG = {
-    "pixel_shape" : (DEFAULT_HEIGHT, DEFAULT_WIDTH),
+    "pixel_shape" : (DEFAULT_PIXEL_HEIGHT, DEFAULT_PIXEL_WIDTH),
 }
 
 MEDIUM_QUALITY_CAMERA_CONFIG = {
@@ -28,7 +28,7 @@ DEFAULT_POINT_THICKNESS = 4
 
 
 FRAME_HEIGHT = 8.0
-FRAME_WIDTH = FRAME_HEIGHT * DEFAULT_WIDTH / DEFAULT_HEIGHT
+FRAME_WIDTH = FRAME_HEIGHT * DEFAULT_PIXEL_WIDTH / DEFAULT_PIXEL_HEIGHT
 FRAME_Y_RADIUS = FRAME_HEIGHT/2
 FRAME_X_RADIUS = FRAME_WIDTH/2