Fix copypasta errors

proper sub and scalar names help things run better...