Comment by ks2048

Can someone point the heart of this fix? I see a bunch of change of naming of constants, etc