changed all naming conventions and sensor types