small refactory on package space name