Renamed commandlets

Also fixed a few error messages