US536 - Tidy up property filenames
Merge branch 'development' into development-work