Minor changes
Naming change