Cleanup: removed ULS from file names and feature names

Change-Id: Id45289ba710b9b543744655f8fbd0f9483923956