renaming and refactor

approve it, BITCH!!!