Class B reference identification rewrite