Fixed type names to get (filtering) the correct attributes