Updated name structure and a few small fixes