Changed names to two-letter references that don't necessarily make sense... cause this thing is now public.