fix bugs. Naming