Change naming convention
Rebuild theme