Issue 50: better naming; remove Jsr305 'single' annotation because it tests the Java language