I would probably drop the extension name in the future, look a wee bit cleaner imo.