Fix up some references to the maven artifacts, and make cleaner version variable.