Rename api packages due to classloading