rename some functions again
bugfix