Renamed defines to match better with POM name structures.