style update

functions moved to core namespace and some function names changed for
consistency