Add setter and correct naming convention