clean dsl spec up
Better naming in dsl methods