Change sensor names to enumeration, fetch from master branch and fix