Renaming for use with the Camera Wrapper
Using blobs from serrano-common.
Could break some functionality but enables camera.