Renaming/refactoring cont.