Changed name of generic helpers