refactoring and renaming
removed t prefix