Initial work for the machine device updates, go through and fix some problems with currently merged code either using bad names, sorting out platform-data registering calls and other misc problems.