Change package naming to follow ES conventions