Updated jeweler, renaming old class names