Fixed incorrect namespace bug and usage of reserved word "package"