Use clearer naming scheme for generated functions