Fixed naming issue and fixed some issues with RCC server