Simplify names for easier filtering