Names and paths updates.

Signed-off-by: Norv <norv@simplemachines.org>
Merge pull request #1 from norv/master

Names/paths updates