Rename function names for better  comprehensibility