You should probably either fully commit to using the short names, or not use the short names at all. Some places in the code use the short names, others use the long ones.