Adjusted function names to consistency