Revert "Change artifact id name as described in Issue #83."

This reverts commit cd72bf764d959fe9cfc4e2d9e2afaa6bd7409ff0.
Merge commit '98e5e093d7fd37ee176fd53264ff335549e8943d'