Fixed comment and function names mix-up