Patching up naming, and added understandable constant