added 'l_' prefix for names that can be redefined externally
3 files changed