Changed some names to reflect "jewel" paradigm.