Updating headroom classes for consistency