Added a bunch of possible renamings of elements.
Moving a few functions from header files to C files.