Updated method naming scheme