refactoring names
fixed compile errors
fixed compile errors