Some minor renaming; switch back to springloaded 1.1.4 as 1.1.3 does not work on Oracle JDK