Rename
Findbugs dependency
private modifiers