rename modules to reflect android sdk package names