Fix package and templates name