Renamed artifacts.
Simplified/unified environment.