Changed glass to stone type and added names