Rename to match class name