Tweaked basic spec
Renamed basic spec file
Updated files for renamed basic spec file