Fixed visibility issue + naming conventions