Renaming the class to play nice with the future puppet-androidndk