Package name fixes, directive added