Build 2: Fixing naming etc