Revert of artifact id change
Merge origin/master