Fixed missing quotes
Removed defpackage form from further redefinitions