Change function names to something more specific to prevent potential issues