fixing structure & naming conventions