# This is a combination of 2 commits.
# The first commit's message is:

updates package names to full plugin names for scripts

# The 2nd commit message will be skipped:

#	fixes cpp plugin names