Cleaned up function names with better naming convention.