Adds central utility and refactors naming.