names refactoring
small fixes