Revert "Change Maven identifiers"

This reverts commit f38e278f830a4cf4eb6bd9174ba7b4f12f90eeb9.