Minor fixes for file rename