Changed package name and some variable names