Update files to naming-conventions

While the file names have been canged the internal use of these function hadn't bee so far.