Moving to underscores for internal metadata