more rename & refactor methods