Refactor non-JDK8 classes towards JDK-8 namings where appropriate