     Accumulator:      2
     Immediate:        3
     ZeroPage:         4
-    IndexedXZeroPage: 5
+    ZeroPageX: 5
     IndexedYZeroPage: 6
     Absolute:         7
-    IndexedXAbsolute: 8
-    IndexedYAbsolute: 9
+    AbsoluteX: 8
+    AbsoluteY: 9
     Relative:         10
     Indirect:         11
-    IndexedXIndirect: 12
-    IndirectIndexedY: 13
+    IndirectX: 12
+    IndirectY: 13
 
 Instruction = 
     ADC:  1

        @registerAddressingMode AddressingMode.Absolute, ->
            @readNextProgramWord()

        @registerAddressingMode AddressingMode.IndexedXAbsolute, ->
            @getIndexedAddressWord @readNextProgramWord(), @registerX

        @registerAddressingMode AddressingMode.IndexedYAbsolute, ->
            @getIndexedAddressWord @readNextProgramWord(), @registerY

        @registerAddressingMode AddressingMode.Relative, ->

        @registerAddressingMode AddressingMode.Indirect, ->
            @readWord @readNextProgramWord()

        @registerAddressingMode AddressingMode.IndirectX, ->
            address = @getIndexedAddressByte @readNextProgramByte(), @registerX
            @readWord address

        @registerAddressingMode AddressingMode.IndirectY, ->
            base = @readWord @readNextProgramByte()
            @getIndexedAddressWord base, @registerY

