Rename function

Renamed function to be more general