Changed some naming and make script.