Adopted correct naming scheme