Changed constant-names for clarity-reasons