fixed typo
fixed the keywords
fixed vendor folder path
fi conflict