First pass at removing ID properties and replacing them with more descriptive properties.