Functions renamed to comply with naming convention