improve naming conventions - fixes #6 #10