FINAL modifier where applicable, pkg name changes.