[FIX] Make composer worth with updates in flp

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/experimental@50278 b456876b-0849-0410-b77d-98878d47e9d5
[FIX] CLeanup with better naming conventions

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/experimental@50279 b456876b-0849-0410-b77d-98878d47e9d5