Some naming changes and graphics updates