Update Names and fix calling a static method from an instance.