Fixed some issues with naming