Correct names
Correct names 2
Add Hybrid Conf file for mako
Not using the script to build the rom