Minor File renaming and xml modifications