Add specs, fix naming