Recompiled dist (after merge)
Normalized specs definition and naming