More cleaning of extension names.