Fixes constant names
Fixes access rights with injected fields
Fixes constant naming
Fixing a bunch of magic numbers
Fixes some constant naming