Pretty up naming conventions