Move everything to proper names. Update list of specs.