Fixed bugs on naming conventions