Controller updates

Update controller sample, fix incorrect constant names.