renamed some conflicting function names