Merge "Fix long package name and apply mapping table style"