Changes to naming to align C# project and Javascript project