More readable variable names and fix some potential buffer overflows by
using the safer variants of strcpy, strcat, sprintf, etc.