Refactored lore and rename