Minor name changes and locked camera to portrait