Revert "Revert "Change Maven identifiers""

This reverts commit 1813386753e1e974b15d645458e042468bff564c.