In-progress session for colour and depth.
minor naming changes.