hyphen was needed
remove useless current() call
fix package name