More minor renaming
more verbose lowercase function names