adjusting naming conventions