refactor, renaming
renaming#2