Adjusting naming conventions...