Renamed some spec functions