Removed useless prefixes from flag names