Nicer naming scheme