Minor changes and file rename.