improving naming convention compat