Just some name fixes.
Function name with old standard, and no function to go to..