Added metadata-based names to number class