Fix naming to match conventions