Renamed artifacts to conform to new, consistent naming scheme.
Merge remote-tracking branch 'origin/master'