Changes to be more in line with the 'official' maven repo names