cosmetic changes to function naming
changes by Sven