package name fixes

I didn't submit changes to templates, so previous fix actually wasn't very useful :) please double check. It should make more sense now.