Removed "System" since this is not used in most Constants (e.g. Twitter, Facebook, ...)