Java 8 warns that using _ as identifier might be removed in future releases, so
we clean that up in this commit.