Change some names to make it more generic