More updates to naming according to "jewel" theme.