Renaming stuff
Complete reworking of the spec layout