Changed package name and added some concatenation.