Will/room

Changed variable names to camel case