Semantic renaming to reflect current functionality