Added correct use statements rather rely on the fact that the modules have been loaded else where
Fixed file rename