finalized refactoring on old naming conventions