Remove additional references to the prefix_name parameter