Repair non-final to final call
Package rename