Better naming scheme throughout application, small changes