Name fixes after the rename to Core and Game folders.