Properly name internal functions