Major grammar cleanup using object suffixes and prefixes wherever possible