names refactoring and little fixes