fixed inconsistent function naming conventions