Add Surface suffix to surfaces classes.